Google Git
Sign in
chromium / external / gitster / git-htmldocs / 0299d92c0447b72142f40f7b12f912d028b61c53 / . / git-reflog.html
blob: 53f651e79ff6537e501aea91a8cae2f645bca052 [file] [log] [blame]
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]6<meta name="generator" content="AsciiDoc 8.2.5" />
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]7<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]19a {
20 color: blue;
21 text-decoration: underline;
22}
23a:visited {
24 color: fuchsia;
25}
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]26
27em {
28 font-style: italic;
29}
30
31strong {
32 font-weight: bold;
33}
34
35tt {
36 color: navy;
37}
38
39h1, h2, h3, h4, h5, h6 {
40 color: #527bbd;
41 font-family: sans-serif;
42 margin-top: 1.2em;
43 margin-bottom: 0.5em;
44 line-height: 1.3;
45}
46
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]47h1, h2, h3 {
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]48 border-bottom: 2px solid silver;
49}
50h2 {
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]51 padding-top: 0.5em;
52}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]53h3 {
54 float: left;
55}
56h3 + * {
57 clear: left;
58}
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]59
60div.sectionbody {
61 font-family: serif;
62 margin-left: 0;
63}
64
65hr {
66 border: 1px solid silver;
67}
68
69p {
70 margin-top: 0.5em;
71 margin-bottom: 0.5em;
72}
73
74pre {
75 padding: 0;
76 margin: 0;
77}
78
79span#author {
80 color: #527bbd;
81 font-family: sans-serif;
82 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]83 font-size: 1.1em;
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]84}
85span#email {
86}
87span#revision {
88 font-family: sans-serif;
89}
90
91div#footer {
92 font-family: sans-serif;
93 font-size: small;
94 border-top: 2px solid silver;
95 padding-top: 0.5em;
96 margin-top: 4.0em;
97}
98div#footer-text {
99 float: left;
100 padding-bottom: 0.5em;
101}
102div#footer-badges {
103 float: right;
104 padding-bottom: 0.5em;
105}
106
107div#preamble,
108div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
109div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
110div.admonitionblock {
111 margin-right: 10%;
112 margin-top: 1.5em;
113 margin-bottom: 1.5em;
114}
115div.admonitionblock {
116 margin-top: 2.5em;
117 margin-bottom: 2.5em;
118}
119
120div.content { /* Block element content. */
121 padding: 0;
122}
123
124/* Block element titles. */
125div.title, caption.title {
126 font-family: sans-serif;
127 font-weight: bold;
128 text-align: left;
129 margin-top: 1.0em;
130 margin-bottom: 0.5em;
131}
132div.title + * {
133 margin-top: 0;
134}
135
136td div.title:first-child {
137 margin-top: 0.0em;
138}
139div.content div.title:first-child {
140 margin-top: 0.0em;
141}
142div.content + div.title {
143 margin-top: 0.0em;
144}
145
146div.sidebarblock > div.content {
147 background: #ffffee;
148 border: 1px solid silver;
149 padding: 0.5em;
150}
151
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]152div.listingblock {
153 margin-right: 0%;
154}
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]155div.listingblock > div.content {
156 border: 1px solid silver;
157 background: #f4f4f4;
158 padding: 0.5em;
159}
160
161div.quoteblock > div.content {
162 padding-left: 2.0em;
163}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]164
165div.attribution {
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]166 text-align: right;
167}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]168div.verseblock + div.attribution {
169 text-align: left;
170}
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]171
172div.admonitionblock .icon {
173 vertical-align: top;
174 font-size: 1.1em;
175 font-weight: bold;
176 text-decoration: underline;
177 color: #527bbd;
178 padding-right: 0.5em;
179}
180div.admonitionblock td.content {
181 padding-left: 0.5em;
182 border-left: 2px solid silver;
183}
184
185div.exampleblock > div.content {
186 border-left: 2px solid silver;
187 padding: 0.5em;
188}
189
190div.verseblock div.content {
191 white-space: pre;
192}
193
194div.imageblock div.content { padding-left: 0; }
195div.imageblock img { border: 1px solid silver; }
196span.image img { border-style: none; }
197
198dl {
199 margin-top: 0.8em;
200 margin-bottom: 0.8em;
201}
202dt {
203 margin-top: 0.5em;
204 margin-bottom: 0;
205 font-style: italic;
206}
207dd > *:first-child {
208 margin-top: 0;
209}
210
211ul, ol {
212 list-style-position: outside;
213}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]214div.olist2 ol {
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]215 list-style-type: lower-alpha;
216}
217
218div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]219 border: 3px solid #527bbd;
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]220}
221thead {
222 font-family: sans-serif;
223 font-weight: bold;
224}
225tfoot {
226 font-weight: bold;
227}
228
229div.hlist {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]233div.hlist td {
234 padding-bottom: 5px;
235}
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]236td.hlist1 {
237 vertical-align: top;
238 font-style: italic;
239 padding-right: 0.8em;
240}
241td.hlist2 {
242 vertical-align: top;
243}
244
245@media print {
246 div#footer-badges { display: none; }
247}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]248
249div#toctitle {
250 color: #527bbd;
251 font-family: sans-serif;
252 font-size: 1.1em;
253 font-weight: bold;
254 margin-top: 1.0em;
255 margin-bottom: 0.1em;
256}
257
258div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
259 margin-top: 0;
260 margin-bottom: 0;
261}
262div.toclevel2 {
263 margin-left: 2em;
264 font-size: 0.9em;
265}
266div.toclevel3 {
267 margin-left: 4em;
268 font-size: 0.9em;
269}
270div.toclevel4 {
271 margin-left: 6em;
272 font-size: 0.9em;
273}
274include1::./stylesheets/xhtml11-manpage.css[]
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]275/* Workarounds for IE6's broken and incomplete CSS2. */
276
277div.sidebar-content {
278 background: #ffffee;
279 border: 1px solid silver;
280 padding: 0.5em;
281}
282div.sidebar-title, div.image-title {
283 font-family: sans-serif;
284 font-weight: bold;
285 margin-top: 0.0em;
286 margin-bottom: 0.5em;
287}
288
289div.listingblock div.content {
290 border: 1px solid silver;
291 background: #f4f4f4;
292 padding: 0.5em;
293}
294
295div.quoteblock-content {
296 padding-left: 2.0em;
297}
298
299div.exampleblock-content {
300 border-left: 2px solid silver;
301 padding-left: 0.5em;
302}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]303
304/* IE6 sets dynamically generated links as visited. */
305div#toc a:visited { color: blue; }
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]306</style>
307<title>git-reflog(1)</title>
308</head>
309<body>
310<div id="header">
311<h1>
312git-reflog(1) Manual Page
313</h1>
314<h2>NAME</h2>
315<div class="sectionbody">
316<p>git-reflog -
317 Manage reflog information
318</p>
319</div>
320</div>
321<h2>SYNOPSIS</h2>
322<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]323<div class="para"><p><em>git reflog</em> &lt;subcommand&gt; &lt;options&gt;</p></div>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]324</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]325<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]326<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]327<div class="para"><p>The command takes various subcommands, and different options
328depending on the subcommand:</p></div>
Junio C Hamanod3339982007-02-09 08:38:48[diff] [blame]329<div class="verseblock">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]330<div class="content"><em>git reflog expire</em> [--dry-run] [--stale-fix] [--verbose]
Junio C Hamanod3339982007-02-09 08:38:48[diff] [blame]331 [--expire=&lt;time&gt;] [--expire-unreachable=&lt;time&gt;] [--all] &lt;refs&gt;&#8230;</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]332<div class="para"><p>+
333<em>git reflog delete</em> ref@{specifier}&#8230;</p></div>
334<div class="para"><p>+
335<em>git reflog</em> [<em>show</em>] [log-options] [&lt;ref&gt;]</p></div>
336<div class="para"><p>Reflog is a mechanism to record when the tip of branches are
337updated. This command is to manage the information recorded in it.</p></div>
338<div class="para"><p>The subcommand "expire" is used to prune older reflog entries.
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]339Entries older than <tt>expire</tt> time, or entries older than
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]340<tt>expire-unreachable</tt> time and not reachable from the current
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]341tip, are removed from the reflog. This is typically not used
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]342directly by the end users &#8212; instead, see <a href="git-gc.html">git-gc(1)</a>.</p></div>
343<div class="para"><p>The subcommand "show" (which is also the default, in the absence of any
Junio C Hamanod3339982007-02-09 08:38:48[diff] [blame]344subcommands) will take all the normal log options, and show the log of
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]345the reference provided in the command-line (or <tt>HEAD</tt>, by default).
346The reflog will cover all recent actions (HEAD reflog records branch switching
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]347as well). It is an alias for <tt>git log -g --abbrev-commit --pretty=oneline</tt>;
348see <a href="git-log.html">git-log(1)</a>.</p></div>
349<div class="para"><p>The reflog is useful in various git commands, to specify the old value
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]350of a reference. For example, <tt>HEAD@{2}</tt> means "where HEAD used to be
351two moves ago", <tt>master@{one.week.ago}</tt> means "where master used to
352point to one week ago", and so on. See <a href="git-rev-parse.html">git-rev-parse(1)</a> for
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]353more details.</p></div>
354<div class="para"><p>To delete single entries from the reflog, use the subcommand "delete"
Junio C Hamano4604fe52008-09-19 06:37:10[diff] [blame]355and specify the _exact_ entry (e.g. "<tt>git reflog delete master@{2}</tt>").</p></div>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]356</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]357<h2 id="_options">OPTIONS</h2>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]358<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]359<div class="vlist"><dl>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]360<dt>
Junio C Hamanoee695f22007-06-21 00:35:36[diff] [blame]361--stale-fix
362</dt>
363<dd>
364<p>
365 This revamps the logic &#8212; the definition of "broken commit"
366 becomes: a commit that is not reachable from any of the refs and
367 there is a missing object among the commit, tree, or blob
368 objects reachable from it that is not reachable from any of the
369 refs.
370</p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]371<div class="para"><p>This computation involves traversing all the reachable objects, i.e. it
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]372has the same cost as <em>git prune</em>. Fortunately, once this is run, we
Junio C Hamanoee695f22007-06-21 00:35:36[diff] [blame]373should not have to ever worry about missing objects, because the current
374prune and pack-objects know about reflogs and protect objects referred by
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]375them.</p></div>
Junio C Hamanoee695f22007-06-21 00:35:36[diff] [blame]376</dd>
377<dt>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]378--expire=&lt;time&gt;
379</dt>
380<dd>
381<p>
382 Entries older than this time are pruned. Without the
383 option it is taken from configuration <tt>gc.reflogExpire</tt>,
384 which in turn defaults to 90 days.
385</p>
386</dd>
387<dt>
388--expire-unreachable=&lt;time&gt;
389</dt>
390<dd>
391<p>
Junio C Hamano54bf1e22008-12-20 06:30:11[diff] [blame]392 Entries older than this time and not reachable from
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]393 the current tip of the branch are pruned. Without the
394 option it is taken from configuration
395 <tt>gc.reflogExpireUnreachable</tt>, which in turn defaults to
396 30 days.
397</p>
398</dd>
399<dt>
400--all
401</dt>
402<dd>
403<p>
404 Instead of listing &lt;refs&gt; explicitly, prune all refs.
405</p>
406</dd>
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]407<dt>
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]408--updateref
409</dt>
410<dd>
411<p>
412 Update the ref with the sha1 of the top reflog entry (i.e.
413 &lt;ref&gt;@{0}) after expiring or deleting.
414</p>
415</dd>
416<dt>
417--rewrite
418</dt>
419<dd>
420<p>
421 While expiring or deleting, adjust each reflog entry to ensure
422 that the <tt>old</tt> sha1 field points to the <tt>new</tt> sha1 field of the
423 previous entry.
424</p>
425</dd>
426<dt>
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]427--verbose
428</dt>
429<dd>
430<p>
431 Print extra information on screen.
432</p>
433</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]434</dl></div>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]435</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]436<h2 id="_author">Author</h2>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]437<div class="sectionbody">
Junio C Hamano0868a302008-07-22 09:20:44[diff] [blame]438<div class="para"><p>Written by Junio C Hamano &lt;gitster@pobox.com&gt;</p></div>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]439</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]440<h2 id="_documentation">Documentation</h2>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]441<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]442<div class="para"><p>Documentation by Junio C Hamano and the git-list &lt;git@vger.kernel.org&gt;.</p></div>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]443</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]444<h2 id="_git">GIT</h2>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]445<div class="sectionbody">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]446<div class="para"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]447</div>
448<div id="footer">
449<div id="footer-text">
Junio C Hamanodca34822010-02-13 01:02:52[diff] [blame]450Last updated 2010-02-13 00:59:53 UTC
Junio C Hamano74640642006-12-27 10:59:55[diff] [blame]451</div>
452</div>
453</body>
454</html>